close #24 renamed function