These are needed for the 2012 solution