Use native js for offenders map
Merge heads