reverting to edm 5.2.0 part 2