neo client - refacto