MAde more amd friendly