Cell phone fix

Closes #186, #162 and #218