fixing tims screw ups