(Mohammed) Added some App Logic stuff