a couple of changes