Better arg handling
Merged