Update commits with LPS and some comments