final changes as per last review