Updated for new pin layout