removed Colin's code