Updated Comments - Finished Joel