wyvern/gargoyle c+c, updated