Fix/ofertie ncl updates switches