refactored to use same data every time