Pieterv api rework