Add back (.) to make transition smoother
Clean up to reflect latest facts