Brought in line with server output