updated naming and order of methods