v1.9

updated back, still not completely fixed