refactored execution path, but left old code in