switch data added - wip