added eric specific changes