restructured for supera3