Changes done according to latest review