Add notice function
Various changes