Update setup to do tasks in a different order