Feature/butterfly

Ok for pull