Changed the template managing system. IF that makes any sense