Make specific to our needs in the Atom org