DOES NOT WORK: something in atomes. This commit is for client/main.c update.