Timing stuff isn't working so I commented it out