Version 2.0.6 complete