Refractoring
Implemented order feature