Broke more commands to troubleshoot