Updated after discussion with Anish