Rat fixes
Performance removed