added some Terpstra-tization