changes as suggested