Adding updates from Ryan to fix the current_account bug...