Added auto-rank option
Added auto-rank option