more re-work with session/langs