Solution reorganization part 2