Timing can now be controlled by make flag