More work done on the pickTarget()