Main works, less hacky concatenations produced