Updated to do LW zero points as well