Updated for reconstruction