YAY for removing this duplication :)