Feature/niec solrization