Updated all main files