working on improved atlas