Daze and Cure Support

More Changes!