More trying to get rid of atlas