try less es loading
better error handling