fix bug and turn to use el-expectations