stage 5 draft commit 2