Final changes for the second phase