Refactoring, timeline established
mergefix