integrated version 2 into the main version and added CSS classes to switch between the two versions