adjust the support files for easier exp&test