lots of stuff
switched to EF
EF changes