Updated for 0.6.54
Updated for 0.6.54