Add more log-statements