Finish for version 1.0