changes as per feedback