draft 3.0.4