Update baba events; Fix a memory issue