CBP adding minimap changes
prepare for rebase and scripting