Feature/between day