Final changes for the first version.
Final changes for the first version