adding support for users coming/going