some new additions enough for v1.0