Adding timer with problems
resolving conflict after adding timer