Final revision for v1.0