make chages for Mozilla review