Final commits for catlas