Make sure we take space into account for updating our data set