DEV: updated atlas generation