some changes as discussed