edit: app, many changes