Changed from handheld to universal