tweak structure to make easier