JB: removed timer