Added order and fixed routes