initial changes to add selection of assignments