changing order to solve request conflicts