some tweaks to class 1