change order of methods to align with old file.