and adding attrs.xml changes.