add modifications to Version 2

add basic modifications (and tests) to Version 2