oops, 2 more changes