vic's updates
merge