Lots of changes all around...