a few more changes...