Added time slider
Merge