updated code with Edge Target Manager...