Updated for 1.4.0