MAIN FILE EDITED