Reorder functions to get sig and non-sig versions side by side