Atlas redux

Let’s see if it’s ok now.