Ver 1.0 finished