Updated for 0.42