improve code #54095bc