Improved cas, finished enr etl