Added the ability to disable the extenting