some stuff
target expansion
remove rubbish
Update from James and TargetExpansion