yes moving that code to support data here, more consistent in one place, go ahead