Overhaul for JB