Final Commit

Final Commit with some correction