Even better improvement to TARGET