Almost ready for update version 2.0