timer function added
merging with remote
merging with remote