Refactored mobile stuff