I can change the raw data layout to something more approtiate if you think it is better?