Added "corral" flags to prevent light leaks in new calculation (-DNEWAMB)