Made a few changes after today's meeting