Updated/fixed ranges