modified to work with evetimer
Revert "modified to work with evetimer"

This reverts commit 54d7c35a9fd7e98e64b4c6ebabf1930736d261c2.