for 0.07 release