Lots of changes, include a different approach.