Updates thanks to feedback from @mattetti