partial reconstruction to use the new dimension system