Modified App code