Changing estimate report logic again