pulling commit
integrating Alex's login updates