Updated for 1.5.4 release