Add appropriate changes to be able to target Grimoire