Started shift to proper logging