Added main modifications