Changes as per feedback