change order
remove redundancy