cleaning up and adding check for new user joining