Changed ordering of methods