Add targeting, change some of the keys