- Fixes more conquer issues, still have problems though