Update to most recent lambency changes