fix
cleaner concat
clean