adding changes to app and other files