Yamaha

Pangea temporary hotfixes here