Added Sam Nasrs EF stuff