Added timing, removed debug printout