Refactoring:  support old mobile browsers