updated code base to 2 versions