expand() added, does not properly work