Better Logic to Rankup

Need to test more but will be much more easy !