Includes work from Aug 3