AM-58 fixed but need to test