yes, I agree. that is also my way of Implementation in #142 , I need to optimize the code.