Client implementation
eol fix