made unit more extendable