Added atom value calculation
Change naming
Fixed En-modifier