Testing Pichi regulation
Resolved merge conflict