second version

updated all function expect file part