Changes

Preparation for the Ordering