dramatic simplification. no longer trying to do too many things.