Improve y scaling
Include selection of sets