JB update 1/2
JB update 2/2