Changes required because hashugar removed