Fixed another output issue, need more refactoring!