CIB with map. Cleaned tested and working