Update to accommodate for YT changes