Adapt app to our requirments