Done user day calculator
merged develop