a couple of changes..