merge mikes changes