v 0.9 fixed bugs (not testing)