Added timer
Added collision detection