LPS 46107

Hopefully these changes work per your email feedback.