buffer + melon position
Merge branch 'john'
item effect rewrite