Added Craigs stuff