Added class and altered addition to compensate