Potentially better code structure handling the atoms