commenting add_range; some mods