Tempo added
Cleanup