- making app more self-contained