Starting to reorganize first and second passes