Working through client requested changes