Phase 2 - fixed minor bug with last commit.