Modified arg handling for abruijn