working on sliders
merge