Attempt at simplifying timing