add normalization, trying to fix the class structure