Should the Class be split part 2