Changes in structure and improved login management
Temporary solution
temporary solution