Improvements to push/pull