JB suggestions for improvement