added attributes and repeating