changes to troubleshoot