changed the order of methods