updates as per PR