Attempted to add more debugging