added attributes and canged toStrings