Now using 1 main version of the api
Fixed some bugs in the timer