Can now support arbitrary faces