remarks adapted for updated Data class