modified the main files