Second commit, fixed timing stuff