should debug logging be added here?