Slight modifs on report