Petr's class 2
merged