Removed amd clutter and added versions