Improved login - started improvement new list