Updated code @ 8:15am on 11/24