1) remove _atom_caller
2) + ~& support