Changes of yesterday+ minor update ch3