Classes modified. If this doesn't work, have mercy on our soul