Refining Push/Pull model