Post audio problem. Few changes. Preparing for the macro-function optimization branch