Restructure to have all the different variations.