Final Commit with minor changes