added id attribute, remove id from all ids