added etl and some change on style