Added in partial noise support