organize -- fixup