[dev] last changes