Added more targeting code,