simplify code and switch to simple atoms, broken