pre-demo final commit