Improve for charged species
Improve for charged species