modified attributes to use raw data
merged conflict in readme