corresponding changes in sourcecode from previous commit