upd
improve
update scopes and files