JBP_9929 edit