corrected 1.1, 2.1 + added structure for rest