Include some updates after clarification