Making solution match in class changes