Lps 31235

Can you review my changes to make sure it's ok