Modified app controller