added handling for args