final batch of changes AMG