further changes as discussed