[UPD] Various changes