Merge changes, change timer to use Handler