added slider.
fixed merging problems.