Updated as per PR notes