v1.0 with more polishing complete