Also AMDified the main file