sync with my faradday git