Add Timer
Fixed unused case warnings