update planning notes before merging stacking branch