wip
added more session stugg
fixed mergconflict