v0.9 cleaned extra code