only the two distance params to fix now