small changes from jasch
conflict