Ordered Version

Small mechanical changes