Quick (very tardy) updates
merging