Adding changes made 9/24 during work