Added timing functions and new scoring scheme