rework towards xts-based ideas