changes missing from previous commit