A few more changes...