Before adding tsunami GFs