modified to work with evetimer