add initial modifications for version#2