Updated to be compatible with the updates for android