lots of changes; more design