Initial code to handle changes to DS