JB suggested improvements