More improvements after call with John1