Tweak output a little again