big changes to programme & major import to better link them and add session info