Back to version 1.0.0.5 part 2