rearranging some commands