updated for 0.15 release