added with session
merged master and fixed bad worker display issue