v1.0 Final changes