Modifications for 0.40 release