review changes before merge

this should pull from attributes