updated to allow more than one user