updated to remove some data