Merging in RRankene's latest changes.