Updates from old sw