updates of main changes