all changes, app works