Final Commit for the first version