another part of the last commit that failed to make it in