Removed the complicated timing stuff.