Adding the slider
Fixing merge conflict