Updated after review comments from WIll and Renzo