Updated for 0.9.8.3 release