vic's server changes
victest
servernode chnges
victest
IT WORKS
merge finish night