changed login structure completely