A rather large number of changes...