changes as per PR