adapted xtas to new layout