before demo update in merry