made ESClient not buggy it will be fixed up later