modified counselor
fixed merge conflicts