SakuraDroid changes