I test this in dev seem working fine. But I'm not sure this will break current movie integration. Might have to test it before merging this.