add fresh tick data and refactor data loading