fixup part II
fixup make use