Tons of changes done during class-time again