fix issue not saving some fields
Prepare factory for weekly cycle