updated 2.0.8 wip