1.0.2.39 dev part 2