Changed order of things for Jaime