upgraded to version 2