Few changes. Need to look into ZnServer stuff.