Update from original to 1.4.0