Real Commit 4 - After merging with Chase's code.