CHanges needed to run with ahope