Updates to main files