Converted overlapping id into a class