Changed timing and removed useless output.