BUG re-added session manager