First implementation of changes

from example functions