Yes, that seems best, will cleanup.