Code Version Merged and Functional