COde Improvements