Updated project
Fixed bug with timer