updated methods order for better reading