Including stefans changes