Removed code for J1.5 and added code to make it compatible with J3.2