Pulling changes

from jon