rewrite v2 without Bootstrap, with Atom