changes for 0.6b