notice fix, change interface