Updating s4 g7 with david refactoring on dates