version 2.0.3 nearly finished