Refactored some systems.