version 2.0.1 semi-working