Added -args
Fixes for -args