Updated class to only pull once