made the location more extendable