discarding input idea
cleanup
Merge branch 'dev'