more b2g code