Before adding Login Functionality