Updating main files with suggestions