reduce some lines of code
added TODO support_test