Update commit to current code for Mei