update 01/20, bosen improved a lot readability