Update from original to 0.5.0