Reactored modify attr to use find by attribute by methdod. No need for find attribute by id method so I removed that as well.