Updated to suit new settings from UART comm