Revision after comments from Papa