adds/changes by patrick