changes to reinit procedure optimization, still problems with intel compiler