-d is back for testing purposes