fixed issue with who var, now going to reorganize