updated to a more minimalist set