Class tweaking