modified to costom app