a couple of more changes