more changes to the subset code -