after meeting 2. changed some things, fixed some things