added multiuser-support