lots of updates, working on detailed performance