added lots of app changes