made arguments more flexible