Sanders redesign (fixes #532)