finished turning butterflies
fixed conflict added refreshState