Lova's changes