added session ids for directories
fixed merge conflicts