Added Code for Mobile Client