Switch to push/pull rather than sleep