Added fixes after read through

Dynamic ranges coming up