some changes after looking thru test.0xdata.com fails