9.32
extracts some duplicated code
9.33
Change format responding to global