LPS-30036

Take a look at the changes.  Test it out.  See if there's anything else that I overlooked in my changes and send it back to me after you're done.  Thanks.