Revert "Revert "added cell phone friendly changes""

This reverts commit 469d4074f6d43ff2a7b60662e4a6b15c9b79ecfd.