Calvin's login changes