Removed helpers, fixed timer