joes updated slider panel
Merge branch 'newbranch'