Updates

from orjinal svn