updated according to last meeting
Revert "updated according to last meeting"

This reverts commit 8017346edfb5729572990f6ef3e865355a7158f2.
Revert "Revert "updated according to last meeting""

This reverts commit 366e9e131c4c40af3a9126a67711fe0f301cab8f.