add mikes changes