Support two figure versions in addition to three figures