Round 2: 2.7 - few changes