Now using param() to pre-resolve notes