modified for better report