Everything reconstructed for better handling