Commit after kmmbvnr comments