Modify methods order