sep-019: minor tide up