changes for initial set handling