Adding changes to main files