part 2 emp fixes