[IMP] improved code for args