Modifications after Fedor comments