Adding "better" output