change methods order