restructure for better comparison