Updated for 0.24.2