stage 5 draft commit 3