Extent

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