finished fixing concat etc