changed arg parsing