@update - adjust for long options