move data closer to use