Lps 51313

CC @mhan810

I made a few changes, please double check that I did not break anything.