Thanks. @sersut @mcquin 

I'll update code more simply.