Final changes for the main code