removed some references to window_yaai_