Latest ETL

Replaced old etl with new etl