amy's fixes