reorganized report logic