Extent

I did the changes we talked about.
Please review them and if you agree merge them.

Thanks