update and try to rebase SVS