added login and structured