* Updated building routine