Working version

slider not merged in