Mai/Svetlana: changed things