major renaming done
minor modifictions