tweaks per Data class tweaks