Actually makes lightweight version work.