v0.6 final fixex