Mapping is working
mapping is working
Making mapping resistent to workers failure