Final notes before merge