Next iteration of the Yamaha adpater