Added ranking checks
Quick alter.