Lats modifications into pre-live that will go to LIVE