added changes as per PR