Move away from JB setup