octopi 0.2.0, patches adjusted