fix to only use the attributes object