Protocol change to work with Android