refactored mobile fix