change to more commonly accepted structure