safety commit prior to demo
refactor