changed to app architecture