3.0.0 code review