Fixed mapping and concatting a bit.