func_vi improve and drepcated some files