changed name to john
merge