andrew's mobile friendly pull request