Change from variables to atoms