start moving to better AMD structure