Final changes for V1.0