Implement report slightly better