updating to changes as discussed