initial 1.0.4 pass