adding a bunch of changes to get naked sets of 1 - 4