part two of previous commit