source ordering with push/pull classes added