Mikes changes merged manually