changed attribute names; removed capitalization