Associative refactor.  Performance started