Added some necessary refinements for mobile