update to AMD or standard loader for rivets