Added O2 optimiation