adjust to new specs2