add changes missing from previous commit