EWF patch initial commit