Now working on 0.9.7