done issue #59
improve arguments selection