taking on board some of Amy's changes