Bit the bullet, eliminated the Attributes as distinct entities.