added multi-user functionality
added multi-user functionality