enhance noise handling
work in progress