refactor VS$expand