almost done beta 0.9