Add timer
merge conflicts