changed spec according to last changes