oops, didn't include these in the last commit