Modify in accordance with the last changes