added terranova and Jeremie