All functionality working correctly, no -d