a couple more changes...