add legasy branch
improve date diff
merge legasy fixes