updated methods order