refactoring the object atlas : still in bad shape