22-09-14 update before live