add changes for 0.10 (leads to 0.11)