Fixed joels screw ups