Update to alpha 24