0.6.1 and changes