Changes for attempt at fixing mobile.