Reworked client output