get current target if exists and fall back to target…but those must be divided into two functions!!!
simple refactor
removed som silly code
malta builds v3.3.1 rev2