Updated for 1.02 release