Exported to work with getTimer() update