Reimplemented timer

+some clean up