a couple more changes