added typsy and diffeo