changes made with latest code ver 2.0