[FOLD] Address mickey's comments