Noty+Minor Changes