newest 2.0 with bugfix