Switched to frame-based timing