Made changes after March 25th classroom meeting