Moved code from CCCgistemp to root to match master.