Changes for incoming 0.2.9