updated slider
merged develop