update class3, still needs a couple tweaks