2.0.8 updates wip