Final Commit with complete code