Changed atomic core

Now more JSTR like.