switch to ef6 code first