updated to allow for multiple users