added a second version of 2 and 3