Starting to add automatic fluid registration