Removed top code (The user check)