now this class in almost half the previous size!