Updated for 5.4.0