reconstructed changes for 0.5.2