Updated to work better with underscores.