O3 and some fix