Main modifs; Uncomment get_cell index; Add compilation markers