Updated For Teacher to fix things