removed timer wrapper