Some changes but still with account bug