Final Commit and did some validation