improved forwarding and add step to remove old vhosts