Fixes for final submit.
Reverted to demo code.
Merge branch 'hotfix/final_submit'