Class Tweaks