First Pull Request Fixes 1

Demo issue
Demo Changes